Make changes requested by Sebastian