refactored to remove ophan instances