Rule 17 added & indent fixed