Modifications fot testing.