Update for linear

Not ready to merge
-------------------------