Improve functions.