Uncommenting out avatar code