2010-10-18 rafael
* updated tree and fix Ids