map evaluation added