annotation updates, interface theoretically complete: