Code updated 2-11