Some more changes for testing