updated per user suggestions