Trunk 3094

Please see this code which I updated.