finally fixed movement!