adding the second changes that Brian told me to add