Massive input overhaul continued