Corrected actor for Q5 - needs refactoring