Add guard-yard