Updated Grammar and Skeleton