check todo
Change some variables