Fixed previous changes.
More late night changes.