After update this function is not working.