Updated for integration into makeflow