added 18 and 19