Better body selection
Added events