HS16-17 revision