Additional code and changed to private.