some minor changes for testing