made some more changes for testing