Hack: changed picker to use compound shapes