incorporated XF and DN comments, still working on LJ.