Changes from project
Some morechanges