Control picking + contours (2011-05-13)