Changed names and added function