Nicer structure on main.