Working on improving the language