updated to match code checker feedback