made final changes noah requested