reworking image stuff