several adjustments to the security model