Started changes
Continue on changing style