more changes to get beat api working