option matrix

latest version with option matrix