fixing moving stuff from last time