added point picker
fixed point picker conflicts