changed functions names