Modvir amplitude bug fixed
Merge conflict resolved
Modvir amplitude bug fixed