updated 30-11