Convert 2-space to 4-space in mapping - consistent with rest of project