some changes
merge
working run.c