filters working
merged
merged again