API Check commented out