Ozan's commit