Rough conversion 1
Rough Conversion 2
Remove old function & comment
More volume updates
Related value changes