Functionality Updated and To Do Modified