@versonika: This looks good.