Fix Swim and balance