More image prep. Not tested yet.