TODO 27 B

123
  1. improve speed for FP maps