Fix/move tools