Changed functions name