add guard-rails