merge changes from Saturday meeting