address comments from Peter and Raimondas