Removed camelcasemotion. Lots of other changes