updated to handle Octawave storage