Major Updates to language