Changed the Combine setup to support the new version (1111)