Additions after workshop