SDC changes + makefile