ahh maybe revert to old version for reason shown at top of file