Avatar index improving, still a bit todo