Rewrote some property passing