Modify code for testing