modifications to keep standard workflow working