Peter thanks for your review. I changed relevant parts.