use new api & remove gem