TODO and Status updated