changed naming convension of the functions