merge with eric's version