Implemented 7 changes as in README