Updating with Jorge's notes