Changed loading and setting update