Changes from Refat A.