somehow these missed an earlier commit
merging a couple changes on a local machine