shape analysis added