pcactor refactored