move functions to fun section