merge mattt's changes