Functions updated