Fix smoothing to use new member variables
Make get_next_likely work with new User class