Merge changes with Maxwell