Compatability with Andi's Environment.. :P