revamp whole thing