Minor Changes to Swim