lots of changes including zoom activation