Added filter, preparing to test fold and things that are based on it