Files needed for testing new simplified code