moved wgi back and tweak deploy