added TODO functions