back on the main branch...oh well
the drastic change they wanted for this workshop...