reworked image flow one more time