Function call redirects are added, more testing needed.