amir, ashok | #124 | mapping new flw fields