Change way to know if is moving