adjusted file to Pedro's requirements