Carried over upgrade and arrow pointer from test domain.