fw minor changes
enhance