make pshape switchable for now