more timer work
removed unnused ands