changed picker
merge ephra with dean at manipulator