Added shaker tracker functionality