removed code to make this section optional