Changing parser to include for two-handedness