Rename, and add the questions