Merge changes from Mark