Overhaul moving towards 1.0