Quick Functionality Improvement