Added filtering of own shape