Update filter
seperated functions