Changes made by Piotr