Functions amended.