Shape Analysis update