Improve on claims demo part