added some important todo