Porting to 2.0
Converting back to updating on minute tick