Removed more redundancy + added a new vulnerability class.