Core pr 3

Updated make file and exported feature.