Fix header + add freeze feature