synching for Nick's fixes