rework existing image checks