UP: Slight modification before workshop