redoing work. Trying a not so naive approach