merge changes from chris.