Added basic beat calculations
Removed redundant beat checks