removed stuff relating to timer b/c was messing up type signature somehow