big changes to look and feel stage 1