Some design amends