Images updates with John 2nd commit