probably should drop this line below the if - follow-up change