Better implementation of the security bits