refine after review w/ Steve and Brad