update. addresses @Gankro's review