Upgrade with the content of the branch master and difficulty added