updated including functions