TreeHelper added and some vhanges