Didn't use timer properly last time, fixed