TO BE UPDATED IDF-7672