Some more quick hacks: