Fixed the language and added critical code