Switching to use the new augmented image stuff that Yu setup