added functions, func params (at least part of it)