updating per comments during review