some tuning to fix volume boundaries
merge