Merging design
Partial merge with new hedding