removed redundancy