Changes to Civic.y