Workshop outline
merging both updates