Merge Carlos' changes