Small changes to Zone