a couple small modifications