[WIP]Vol ops fix

For comments.