Updated for t & c