more more updates for simplicity