Improved Quick Commands