Change answer to question #1 and #2