some  added some todos