Some design improvements.