Looking at lines 618 to 630 is this method even needed?