Added trees & AO fix