Control picking + contours (13-05-2011)