updated for rincewind 1.0