reverting 5911650e80680f1445b55111b958b582f1786ed6 on the design section to be able to merge in hisakonog's change with out losing any references