misnamed functions corrected