Polishing dhcp functions for grading.