reworking on claims in progress. server side