Prototype remap
Concept update