updates from Raimondas