revert to Dan master ospi