merged changes from Zuzanna