New questions + change to question template