Issue #26: updated body event listeners