Updated with a fix for zoom