Carlos' changes