sorting out last merge from Jaime