disabled mapping...pending proper analysis of speed