prepare for new system mapping function