Functionality Improvement | Quick fix in velocity