Last change to remove extra code and update names