changed claim code architecture;