deleted old, outcommented code