All functions updated 2.0