Fixed Integration problems with last commit