trying to clean up 'zone' logic