Made some more changes for testing