refactored claim