Updated for Story B-01043