Cheeky enhancement, feel free to revert if you hate it