Commented out change in functionality that needs its own commit