Updated Main and Lexical Analysis