incorporate L8 and post v.1