removed extra class vars,changed timer functionality