added changes from carlos