Intermediate changes.. Work in progres..