new ref + minor clean up