moved some refs