Improvements & Suggestions