Some more 'improvements'...