Changes for tmp.c