Updated with non-working savedInstanceState