- scrubbed some changes from 0.9.4 for velocity reasons