21 OCT Better save condition in MainFragment