Change and added function definitions