Added Tony's merged changes.