More production changes for testing