Adding in accidentally-removed code