Update (after #41)