some changes on tornado wrapper