Addressed Comments from jeff