Beats form macro refactored
Beats form macro refactored