finished adding image support