updated workshop 2