add debug and Map  i think