forgot to save removal of duplicated code