improve mapping