New parser, fixed up CBS