edited conceptmapper