Added one new pig lab; refactored old ones