add check Catalod + fix swimming bug