Tags :yield improvement