Made the entire simulation about 20% cooler
Updating status in main
Merge branch 'feature-task' into develop