Yossi- Stm and Stm4

now both of the implementations works when stm4 is our "improvement"