consider origin
Change bubbles to single actors
Removed useless import