Improved beat handling