Updated helper (MP2-375)