Carlos's changes