added shape analyzer