Changed functions' names