More modifications to test consumer