Tighten up code, and allow for zoom 6 as well