map switching and dc bug fixing