Added filter and updated the code base a bit