Updating claims - commenting out the bits of code that were not implemented in the end