many changes from making images scan - trying to debug it
including the cluster based image scans