Edited Defender behaviour and condensed (slightly) the new classes