Sorted out avatar stuff