Use nicer headers, get rid of the term lift