changed 2 questions