Changed functions names