Updated full functions