added drowning
rewrote parts