Changed logic for all rotaries