Finish the remaining changes to add filter :)