more consistent mapping