rebase and add some filters