fixed parameter passing
removed the todo list