added lin as part of feat1 branch