Updated to fully online/cached