more changes so close now!!(pair prog)