Refactored Onset and Drop