Added checkOwner and changed set(..)