added possibility of re-mapping