Separate volume handling from note handling