Adding last Thanh updates