changed some in the security part