Changed makefile + unrevert reverted changes