some changees to prerequisites
tidyup