added new Actor-based code