Changes base on Matt's Feedback

Changes base on Matt's Feedback