Modifications on master branch