fix/move shit