Addressing Freds final comments on PR
* Changing is_ok? back to ok?
* Removing depreciation warnings