added some todo taks