merge changes from uwtr