Making the changes DAWacker requested