A bit more update changes