Lots of changes to increase performance on older devices