Various functions updated