Add back the main stuff