Changed some stuff about how actors are generated