Update and improve language