api pull now more flexible