Updated functions in these