1st version working well
Few changes to test