update make file and singlton