Added full JD plus formatting