Update v6

True moderizr support