darn,,,, redo everything