more Boston sprint changes related to #28