Further changes for testing