revamp'd the whole thing