Completed Security Procedure System resolves #5