added 17s and removed old 12s and 13s