Change to use custom avatar