[Added] more changes for answer.