Some zoning changes with @MAglietta