Made som changes to check that it is my own version.