amir, ashok | #123 | flattened location into FLW and removing location