Added JD comments