Fixes #9 to be updated with new api state