fix rn and add generic parse