bringing Rutrix's changes back into main. I didn't get any crashes so hopefully it's all good this time