DF-2664 added modifiable lines and stuff