Fine-tune Guard

Removes guard-rails and adds support for factory watching.