Continued updating support functions.