Added stop at beat behavior