add more refs
anqi before pulling greg's changes
almost last changes