This is from before when I adjusted some function signatures etc.