Improve 1st t&t