some more changes for testing