Minor changes for testing purposes