TODOs
Removing debugger statement