made key mapping better