Accept arguments. Renaming of some functions.