Move back changes to improve speed