Servicing up Bernard and restructuring the workflow