added some questions, check todo comment