Updating for better UX