Mixed commit sorry: Added guard as an alternative to watch and many copy adjustments