make continuous mode mapping better