changes to functions and styles