somes change in functions returns and params