React trans gia

Please integrate my commits during the Christmas.