revamp initial design