Improve t4