wow - how could the old code ever work?