Changing to three file save system