Comment out new functionality for testing