Made Motor stop conditions more efficient