Merged WH's design updates