Changes in some functions