Indroduced jpararw and cleaned up