Change some stuff to mirror NookieDevs setup ( All Credit & thanks to them for their work)