Updated the feature to keep current with what's on Prod.