MUS-49 refactor drums