Important update on some key functions.