minor changes ie. namings etc