Better Beat-calculation