Update to 11-17 and added 11-18