Added filtering and animation