added Luis changes