some little changing in function naming