Changes for TODO file