some changes per Jays email.