Added filter data function
Transitions working