Improved and fixed claim system