More refactoring.
more changes to lincs.inc