Thesis of improving MsWave