Enhanced AtonalUtil logic