Final preparation for volume generation

Very unsafe at the moment, please be careful