first pass at revamp