Added zoom, need to test it