Jgomez2 02

merging Jaime's changes