The language change was well done. Some minor changes and addes error handling.