before merging
fixing flash and map