removed redundant, fixed adding