Integration changes

Some changes for integration purposes. Hopefully it works.