major changes to parser: now accepts all short cut methods