Change check to new api