updates per review from scott