changing size_t to int and adding todo