corrections after Guillermo review