Modified structure and added terminal prefs