Last minute changes for testing. Some changes may need to be reverted.