Final small tweak and merge of design 2!