Updated Grammar (Untested)