Some design improvements by Louis