Adding changes from the last workshop