Version2

Getback version 2  with many fixes