Changes from Pawel&Kamil