Final changes for merge