Added option to pick unit.

Improved lines.