Updated for YATSM cloud screen fix