Yep, I've done both - see the update.