Use up-to-date functions.