Modifying for testing