Added filter functionailty