rev 18 and 17 lines updated