updated 16-10-09