check TODO, major changes