edited some bizarre old code