additional changes for testing performance