adds better image support.