minor nit-pick you may want to mark these 2 as `readOnly` cp's