update to take srcset and picture into account