some updates for angular conversion prep