All functions updated