Changes for freezing