+Functionality Improvements: Updated some code for better results.