Switched to using $interval