Hopefully got all of Torin's tab changes