Updates that wasn't added last time as I need to up my git-fu