Added the design update -- PLEASE INSTA MERGE