Update functions and header