Added changes to make easy motion work