Updated with correct answers