Changed things for clarity