Some preliminary modifications