made final changes from steve