Added in proper filitering of beats