Some guards added.