supporting -t argument and upgrading to 3.3