Redo in Swim. Update stuff