Avatar code - recommit