Updated rule 15 and 16