Updated to include current avatar