We need these changes as well