revamp to one map