adding all the old changes before starting to put all the new modules from cz