More functions updates