Juan's changes for 4.2