Restored old values + fixed movement