Changed accordingly with API