Change the functions
fix the function so far