Updated to get geo and image working again