more updates for simplicity