Added Timer/State Manager