Added shape analysis, to be continued