adding better matching and more archs