#2863: Replacing old version with new one functions.