updates as per 5/19 feedback