lot of changes ( shwups v3 )
changes