Mod1

merging 2 test