Uncommented code previously commented for testing.