tried fixing the client case relationship
refactored Id