#1627 | Trasition, text changes | Navaneeth