Updated activity detection to not be as event driven as before.