Some work on thrusters.cs to improve scalability