removed redundancies