Modified saveForMainGoal and tickAllwalletTableItems