changes in light of @shino comments
stanchion language modifications