added 17 - 25