Requested changes to match Laird's additions