More changes for avatar