Changed flow of beat-handling