update with Aurimas's suggestions