Experimenting with some different changes to try and speed this bad boy up