merge changes from wheatley