New changes

Further progress