@gadrian: Looks good!