kind of defender-ish elements added