Removed TODO for space and time requirements