updates basing on Drew's review feedback