adding changes from workshop