Two functions changed