uh, updated, hopefully w/o conflict...