Some revisions on Section III.A and III.B