Made a few updates thanks to github.com/AndySouter/