changed per the review comments