changed order to temp fix terminal mode