Merge Eddie's redesign