Changes to style - work in progress