adding some functions, modifying others...