Update to new design - part 1