fix mwsl and many ppoups added