Improved override