Added features we came up with in the workshop.