Minor modifications to simplify sample integration