added 2-line and 1-line version