Changed some api