Refactorisation to avoid duplicate image but still need to do block the multi ref across items