just before adding the rest of avatar stuff