Add loop to the whole Table; Rename some functions.