add more conditional code to support migrating with volumes