Rework to make code simpler and avoid changing actor structure.