Changes to functions and added new function to extras