merge 17 and 18