Update 2.4 More Functions