incomplete submapping changes (broken!)