Fix TODOs before showing Suvinay