updated to new question