changes following debug cycle with Alvaro Simon