updated settings, dried up code