minor changes to 18, 19