Some modification for main.c XD