updated per comments