Basic changes to attempt to get zooms working