Made whole bunch of changes