Moddified these files a bit