Changed TODO goals.