address maciej's comments