updated workshop1