some changes to use gtip