New Makefile and modification of scheduler