Changes to functions and info is working