updated 17-1-13