added TODO For naor with other stufs