Added flapMap