added full of shape detection