updating per comments from review