claims added
refactored common functions