Update to match new requirements from Jess.