minor changes -------and-------- DONE