3# Update with latest additions and changes