Added 17 and fixed minor issue in 16