Major rewrite by TED

THANKS!!