changed more, added timer and such