refactored Actors