More Arvin changes