MINOR CHANGE: Conditions changed