Added a TODOs to optimize