Enhancement: only reload when necessary