various changes to test features matching