minor changes to start stream lining use of actor, check how this wil integrate