Some functions changed to private.