Current images. Need to be fixed for 1.5