Upgraded to tinker 1.4