removed hardcoded fields