Add inline updating and hope it works correctly...