Ce's changes for testing