Updated to accomodate new mass-spec program